From 7df6b76a1a3acbe9744fb77df1d614463f07f0bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Lindqvist?= Date: Mon, 18 Aug 2008 17:48:13 +0000 Subject: [PATCH] =?utf8?q?Bug=20541315=20=E2=80=93=20Segfault=20when=20sel?= =?utf8?q?ecting=20a=20GtkMenuItem=20with=20submenu=20and=20no?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-08-18 Björn Lindqvist Bug 541315 – Segfault when selecting a GtkMenuItem with submenu and no parent * gtk/gtkmenuitem.c (gtk_menu_item_real_popup_submenu): Ensure that the menu item has a parent before popping it up. svn path=/trunk/; revision=21149 --- ChangeLog | 8 ++++++++ gtk/gtkmenuitem.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c32ab33a95..eb1967da28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-08-18 Björn Lindqvist + + Bug 541315 – Segfault when selecting a GtkMenuItem with submenu + and no parent + + * gtk/gtkmenuitem.c (gtk_menu_item_real_popup_submenu): Ensure + that the menu item has a parent before popping it up. + 2008-08-18 Johan Dahlin Bug 548196 – gtk-builder-convert doesn't properly convert GtkTextView diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index a7256af113..b8fae76149 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1137,7 +1137,7 @@ gtk_menu_item_real_popup_submenu (GtkWidget *widget, { GtkMenuItem *menu_item = GTK_MENU_ITEM (widget); - if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu)) + if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu) && widget->parent) { gboolean take_focus; GtkMenuPositionFunc menu_position_func; -- 2.30.2